Iterate through children of the action area, not of the vbox. (#58278,

Fri Nov  2 08:17:06 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkdialog.c (gtk_dialog_set_response_sensitive):
	Iterate through children of the action area, not of
	the vbox. (#58278, Sergey Kuzminov)

diff --git a/ChangeLog b/ChangeLog
index 95f5e71430f64a5af82f07a137d85fc0c6e9313b..d422297b6e77f994bb9fef7490201ab700459065 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov  2 08:17:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkdialog.c (gtk_dialog_set_response_sensitive): 
+       Iterate through children of the action area, not of
+       the vbox. (#58278, Sergey Kuzminov)
+
 2001-11-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktext.c (gtk_text_set_position): handle -1 argument in
@@ -100,6 +106,7 @@ Thu Nov  1 00:44:50 2001  Jonathan Blandford  <jrb@redhat.com>
        * gtk/gtktreeview.c (gtk_tree_view_class_init): Support Shift,
        Control, and Shift|Control L<->R, #63475
 
+>>>>>>> 1.2518
 Wed Oct 31 18:53:51 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 95f5e71430f64a5af82f07a137d85fc0c6e9313b..d422297b6e77f994bb9fef7490201ab700459065 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Fri Nov  2 08:17:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkdialog.c (gtk_dialog_set_response_sensitive): 
+       Iterate through children of the action area, not of
+       the vbox. (#58278, Sergey Kuzminov)
+
 2001-11-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktext.c (gtk_text_set_position): handle -1 argument in
@@ -100,6 +106,7 @@ Thu Nov  1 00:44:50 2001  Jonathan Blandford  <jrb@redhat.com>
        * gtk/gtktreeview.c (gtk_tree_view_class_init): Support Shift,
        Control, and Shift|Control L<->R, #63475
 
+>>>>>>> 1.2518
 Wed Oct 31 18:53:51 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 95f5e71430f64a5af82f07a137d85fc0c6e9313b..d422297b6e77f994bb9fef7490201ab700459065 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Nov  2 08:17:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkdialog.c (gtk_dialog_set_response_sensitive): 
+       Iterate through children of the action area, not of
+       the vbox. (#58278, Sergey Kuzminov)
+
 2001-11-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktext.c (gtk_text_set_position): handle -1 argument in
@@ -100,6 +106,7 @@ Thu Nov  1 00:44:50 2001  Jonathan Blandford  <jrb@redhat.com>
        * gtk/gtktreeview.c (gtk_tree_view_class_init): Support Shift,
        Control, and Shift|Control L<->R, #63475
 
+>>>>>>> 1.2518
 Wed Oct 31 18:53:51 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 95f5e71430f64a5af82f07a137d85fc0c6e9313b..d422297b6e77f994bb9fef7490201ab700459065 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Nov  2 08:17:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkdialog.c (gtk_dialog_set_response_sensitive): 
+       Iterate through children of the action area, not of
+       the vbox. (#58278, Sergey Kuzminov)
+
 2001-11-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktext.c (gtk_text_set_position): handle -1 argument in
@@ -100,6 +106,7 @@ Thu Nov  1 00:44:50 2001  Jonathan Blandford  <jrb@redhat.com>
        * gtk/gtktreeview.c (gtk_tree_view_class_init): Support Shift,
        Control, and Shift|Control L<->R, #63475
 
+>>>>>>> 1.2518
 Wed Oct 31 18:53:51 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 95f5e71430f64a5af82f07a137d85fc0c6e9313b..d422297b6e77f994bb9fef7490201ab700459065 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Nov  2 08:17:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkdialog.c (gtk_dialog_set_response_sensitive): 
+       Iterate through children of the action area, not of
+       the vbox. (#58278, Sergey Kuzminov)
+
 2001-11-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktext.c (gtk_text_set_position): handle -1 argument in
@@ -100,6 +106,7 @@ Thu Nov  1 00:44:50 2001  Jonathan Blandford  <jrb@redhat.com>
        * gtk/gtktreeview.c (gtk_tree_view_class_init): Support Shift,
        Control, and Shift|Control L<->R, #63475
 
+>>>>>>> 1.2518
 Wed Oct 31 18:53:51 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 95f5e71430f64a5af82f07a137d85fc0c6e9313b..d422297b6e77f994bb9fef7490201ab700459065 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Nov  2 08:17:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkdialog.c (gtk_dialog_set_response_sensitive): 
+       Iterate through children of the action area, not of
+       the vbox. (#58278, Sergey Kuzminov)
+
 2001-11-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktext.c (gtk_text_set_position): handle -1 argument in
@@ -100,6 +106,7 @@ Thu Nov  1 00:44:50 2001  Jonathan Blandford  <jrb@redhat.com>
        * gtk/gtktreeview.c (gtk_tree_view_class_init): Support Shift,
        Control, and Shift|Control L<->R, #63475
 
+>>>>>>> 1.2518
 Wed Oct 31 18:53:51 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 95f5e71430f64a5af82f07a137d85fc0c6e9313b..d422297b6e77f994bb9fef7490201ab700459065 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Nov  2 08:17:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkdialog.c (gtk_dialog_set_response_sensitive): 
+       Iterate through children of the action area, not of
+       the vbox. (#58278, Sergey Kuzminov)
+
 2001-11-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktext.c (gtk_text_set_position): handle -1 argument in
@@ -100,6 +106,7 @@ Thu Nov  1 00:44:50 2001  Jonathan Blandford  <jrb@redhat.com>
        * gtk/gtktreeview.c (gtk_tree_view_class_init): Support Shift,
        Control, and Shift|Control L<->R, #63475
 
+>>>>>>> 1.2518
 Wed Oct 31 18:53:51 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix

diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 702cba2911273543649c0c9d3764bb12f07789cb..12325f7e90ce90fa5b77bd4fb75af2ea5661f36d 100644 (file)
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -613,6 +613,34 @@ gtk_dialog_add_buttons (GtkDialog   *dialog,
   va_end (args);
 }
 
+static GtkWidget *
+find_child_by_response_id (GtkDialog *dialog,
+                          gint       response id)
+{
+  GList *children;
+  GList *tmp_list;
+  GtkWidget *result = NULL:
+
+  children = gtk_container_get_children (GTK_CONTAINER (dialog->action_area));
+
+  tmp_list = children;
+  while (tmp_list != NULL)
+    {
+      GtkWidget *widget = tmp_list->data;
+      ResponseData *rd = g_object_get_data (G_OBJECT (widget),
+                                            "gtk-dialog-response-data");
+
+      if (rd && rd->response_id == response_id)
+       {
+         result = widget;
+        gtk_widget_set_sensitive (widget, setting);
+
+      tmp_list = g_list_next (tmp_list);
+    }
+
+  g_list_free (children);
+}
+
 /**
  * gtk_dialog_set_response_sensitive:
  * @dialog: a #GtkDialog
@@ -632,7 +660,7 @@ gtk_dialog_set_response_sensitive (GtkDialog *dialog,
   GList *children;
   GList *tmp_list;
 
-  children = gtk_container_get_children (GTK_CONTAINER (dialog));
+  children = gtk_container_get_children (GTK_CONTAINER (dialog->action_area));
 
   tmp_list = children;
   while (tmp_list != NULL)